From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 Jul 2011 01:03:12 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~74
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e0ef68091990f0c9aa13b2691fa69ad16a7cd0f1;p=emacs.git

Merge from trunk.
---

e0ef68091990f0c9aa13b2691fa69ad16a7cd0f1